From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 13:35:32 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9e85e5849326ef68f54e7d21abc2bf898c158a37;p=emacs.git

merge from trunk
---

9e85e5849326ef68f54e7d21abc2bf898c158a37